+2000-12-09 James Henstridge <james@daa.com.au>
+
+ * gdk/linux-fb/gdkmouse-fb.c (GdkFBMouseDevice): add prot struct
+ member to hold masks for detecting the start of a protocol packet.
+ (mouse_devs): add packet start masks for ps2 and ms device types.
+ Left the mask for fidmour blank, as I have no idea what it should
+ be.
+ (handle_mouse_io): skip bytes until we get to the start of a
+ packet. My Logitech mouse seems to be passing an extra NULL pad
+ byte, and GPM does a similar thing here.
+ (gdk_fb_mouse_ms_open): changed error message to not say psaux, as
+ this is the ms mouse driver.
+ (gdk_fb_mouse_ms_packet): fix up button handling, which was
+ completely broken except for button1. It was checking the wrong
+ bit in the packet for the status of the right mouse button, and
+ wrongly assuming right == button2 rather than 3. I fixed that and
+ also added support for middle button (button2).
+
2000-12-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (gtk_text_btree_insert): fix breakage here
+2000-12-09 James Henstridge <james@daa.com.au>
+
+ * gdk/linux-fb/gdkmouse-fb.c (GdkFBMouseDevice): add prot struct
+ member to hold masks for detecting the start of a protocol packet.
+ (mouse_devs): add packet start masks for ps2 and ms device types.
+ Left the mask for fidmour blank, as I have no idea what it should
+ be.
+ (handle_mouse_io): skip bytes until we get to the start of a
+ packet. My Logitech mouse seems to be passing an extra NULL pad
+ byte, and GPM does a similar thing here.
+ (gdk_fb_mouse_ms_open): changed error message to not say psaux, as
+ this is the ms mouse driver.
+ (gdk_fb_mouse_ms_packet): fix up button handling, which was
+ completely broken except for button1. It was checking the wrong
+ bit in the packet for the status of the right mouse button, and
+ wrongly assuming right == button2 rather than 3. I fixed that and
+ also added support for middle button (button2).
+
2000-12-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (gtk_text_btree_insert): fix breakage here
+2000-12-09 James Henstridge <james@daa.com.au>
+
+ * gdk/linux-fb/gdkmouse-fb.c (GdkFBMouseDevice): add prot struct
+ member to hold masks for detecting the start of a protocol packet.
+ (mouse_devs): add packet start masks for ps2 and ms device types.
+ Left the mask for fidmour blank, as I have no idea what it should
+ be.
+ (handle_mouse_io): skip bytes until we get to the start of a
+ packet. My Logitech mouse seems to be passing an extra NULL pad
+ byte, and GPM does a similar thing here.
+ (gdk_fb_mouse_ms_open): changed error message to not say psaux, as
+ this is the ms mouse driver.
+ (gdk_fb_mouse_ms_packet): fix up button handling, which was
+ completely broken except for button1. It was checking the wrong
+ bit in the packet for the status of the right mouse button, and
+ wrongly assuming right == button2 rather than 3. I fixed that and
+ also added support for middle button (button2).
+
2000-12-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (gtk_text_btree_insert): fix breakage here
+2000-12-09 James Henstridge <james@daa.com.au>
+
+ * gdk/linux-fb/gdkmouse-fb.c (GdkFBMouseDevice): add prot struct
+ member to hold masks for detecting the start of a protocol packet.
+ (mouse_devs): add packet start masks for ps2 and ms device types.
+ Left the mask for fidmour blank, as I have no idea what it should
+ be.
+ (handle_mouse_io): skip bytes until we get to the start of a
+ packet. My Logitech mouse seems to be passing an extra NULL pad
+ byte, and GPM does a similar thing here.
+ (gdk_fb_mouse_ms_open): changed error message to not say psaux, as
+ this is the ms mouse driver.
+ (gdk_fb_mouse_ms_packet): fix up button handling, which was
+ completely broken except for button1. It was checking the wrong
+ bit in the packet for the status of the right mouse button, and
+ wrongly assuming right == button2 rather than 3. I fixed that and
+ also added support for middle button (button2).
+
2000-12-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (gtk_text_btree_insert): fix breakage here
+2000-12-09 James Henstridge <james@daa.com.au>
+
+ * gdk/linux-fb/gdkmouse-fb.c (GdkFBMouseDevice): add prot struct
+ member to hold masks for detecting the start of a protocol packet.
+ (mouse_devs): add packet start masks for ps2 and ms device types.
+ Left the mask for fidmour blank, as I have no idea what it should
+ be.
+ (handle_mouse_io): skip bytes until we get to the start of a
+ packet. My Logitech mouse seems to be passing an extra NULL pad
+ byte, and GPM does a similar thing here.
+ (gdk_fb_mouse_ms_open): changed error message to not say psaux, as
+ this is the ms mouse driver.
+ (gdk_fb_mouse_ms_packet): fix up button handling, which was
+ completely broken except for button1. It was checking the wrong
+ bit in the packet for the status of the right mouse button, and
+ wrongly assuming right == button2 rather than 3. I fixed that and
+ also added support for middle button (button2).
+
2000-12-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (gtk_text_btree_insert): fix breakage here
+2000-12-09 James Henstridge <james@daa.com.au>
+
+ * gdk/linux-fb/gdkmouse-fb.c (GdkFBMouseDevice): add prot struct
+ member to hold masks for detecting the start of a protocol packet.
+ (mouse_devs): add packet start masks for ps2 and ms device types.
+ Left the mask for fidmour blank, as I have no idea what it should
+ be.
+ (handle_mouse_io): skip bytes until we get to the start of a
+ packet. My Logitech mouse seems to be passing an extra NULL pad
+ byte, and GPM does a similar thing here.
+ (gdk_fb_mouse_ms_open): changed error message to not say psaux, as
+ this is the ms mouse driver.
+ (gdk_fb_mouse_ms_packet): fix up button handling, which was
+ completely broken except for button1. It was checking the wrong
+ bit in the packet for the status of the right mouse button, and
+ wrongly assuming right == button2 rather than 3. I fixed that and
+ also added support for middle button (button2).
+
2000-12-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (gtk_text_btree_insert): fix breakage here
+2000-12-09 James Henstridge <james@daa.com.au>
+
+ * gdk/linux-fb/gdkmouse-fb.c (GdkFBMouseDevice): add prot struct
+ member to hold masks for detecting the start of a protocol packet.
+ (mouse_devs): add packet start masks for ps2 and ms device types.
+ Left the mask for fidmour blank, as I have no idea what it should
+ be.
+ (handle_mouse_io): skip bytes until we get to the start of a
+ packet. My Logitech mouse seems to be passing an extra NULL pad
+ byte, and GPM does a similar thing here.
+ (gdk_fb_mouse_ms_open): changed error message to not say psaux, as
+ this is the ms mouse driver.
+ (gdk_fb_mouse_ms_packet): fix up button handling, which was
+ completely broken except for button1. It was checking the wrong
+ bit in the packet for the status of the right mouse button, and
+ wrongly assuming right == button2 rather than 3. I fixed that and
+ also added support for middle button (button2).
+
2000-12-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (gtk_text_btree_insert): fix breakage here
************ Device specific mouse code **************
******************************************************/
+/* proto is used to detect the start of the packet:
+ * (buf[0]&proto[0]) == proto[1]
+ * indicates start of packet.
+ */
+
struct _GdkFBMouseDevice {
char *name;
gint packet_size;
gboolean (*open)(GdkFBMouse *mouse);
void (*close)(GdkFBMouse *mouse);
gboolean (*parse_packet)(GdkFBMouse *mouse, gboolean *got_motion);
+ guchar proto[2];
};
static gboolean handle_mouse_io (GIOChannel *gioc,
3,
gdk_fb_mouse_ps2_open,
gdk_fb_mouse_ps2_close,
- gdk_fb_mouse_ps2_packet
+ gdk_fb_mouse_ps2_packet,
+ { 0xc0, 0x00 }
},
{ "ms",
3,
gdk_fb_mouse_ms_open,
gdk_fb_mouse_ms_close,
- gdk_fb_mouse_ms_packet
+ gdk_fb_mouse_ms_packet,
+ { 0x40, 0x40 }
},
{ "fidmour",
5,
gdk_fb_mouse_fidmour_open,
gdk_fb_mouse_fidmour_close,
- gdk_fb_mouse_fidmour_packet
+ gdk_fb_mouse_fidmour_packet,
+ { 0x00, 0x00 } /* don't know what packet start looks like */
}
};
{
GdkFBMouse *mouse = (GdkFBMouse *)data;
GdkFBMouseDevice *dev = mouse->dev;
+ guchar *proto = dev->proto;
gboolean got_motion;
- gint n;
+ gint n, i;
got_motion = FALSE;
n = read (mouse->fd, mouse->mouse_packet + mouse->packet_nbytes, dev->packet_size - mouse->packet_nbytes);
if (n<=0) /* error or nothing to read */
break;
+
+ /* we just read in what should be the first byte of a packet */
+ if (mouse->packet_nbytes == 0)
+ {
+ /* check to see if we have the first byte of a packet.
+ * if not, throw it away */
+ while ((mouse->mouse_packet[0] & proto[0]) != proto[1] && n > 0)
+ {
+ for (i = 1; i < n; i++)
+ mouse->mouse_packet[i-1] = mouse->mouse_packet[i];
+ n--;
+ }
+ /* if none of the bytes read were packet starts, break */
+ if (n <= 0)
+ break;
+ }
mouse->packet_nbytes += n;
return FALSE;
while ((i = read (fd, buf, sizeof(buf))) > 0)
- g_print ("Got %d bytes of junk from psaux\n", i);
+ g_print ("Got %d bytes of junk from /dev/mouse\n", i);
tcgetattr (fd, &tty);
tty.c_iflag = IGNBRK | IGNPAR;
int dx=0, dy=0;
gboolean new_button1, new_button2, new_button3;
guchar *buf;
+ static guchar prev = 0;
buf = mouse->mouse_packet;
- new_button1 = (buf[0] & 0x20) && 1;
- new_button2 = (buf[1] & 0x10) && 1;
- new_button3 = 0;
+ /* handling of third button is adapted from gpm ms driver */
+ if (buf[0] == 0x40 && !(prev|buf[1]|buf[2]))
+ {
+ new_button1 = 0;
+ new_button2 = 1;
+ new_button3 = 0;
+ }
+ else
+ {
+ new_button1 = (buf[0] & 0x20) && 1;
+ new_button2 = 0;
+ new_button3 = (buf[0] & 0x10) && 1;
+ }
+ prev = (new_button1 << 2) | (new_button2 << 1) | (new_button3 << 0);
if (*got_motion &&
(new_button1 != mouse->button_pressed[0] ||
projects / gtk4.git / commitdiff